Renamed some things and added some entities, fixed screen