adding in an xbox controller object and a few other fixes