Updated EntityMain a lot