cleaned up mysafari, more user stories finished