Changed some crap and added entities