cleanup and fixes for ocarina