Diverse smaller changes, removed andengine dialog