Whoa there lots of fixes

Getting ready for entities