Some cleanup, add obsession and some more objective-c stuff