finished cleaning headers! builds and runs on OSX and iOS