update TODO, update OSX 360 controls, take out third thread