Entity Update

I got some fire working...
Hotfixes and Bugs

Entities really fixed, bugs created - refer to TODO.txt