model package:
	- toString fixes
	- code clean up