Just a few fixes and updates.
This update contains many fixes that were broken in the last version
A few entity fixes and few new features.