Sal Scotto:
	- Fix for a few bugs
