controller fixing, still WIP