fixed formatting and cosmetic issues.
cosmetics.
updated entity definitions, and cleaned up some code.
Merge pull request #112 from dictoon/master

updated entity definitions, and cleaned up some code.