- Removed debugging code accidentally committed.
- Added some string-formatting safety on OSX & iOS.  This stuff needs a serious clean-up however.