Added PlayerController and some other minor issues