Some Entity Stuff

A few small changes to entities
Last commit before server/client are split up