Tom's changes on the prototype machine
minor xcode stuff