More updates to Entity, PlayerController, BaseEntity