merged playerObjects branch with master, as well as fixed some last-minute bugs.