Sal Scotto:
	- added a few more asserts
	- Fix for a few bugs
