Improved support for compilation for simulator on command line
Removed/Added some NSLogs (more will fall down!)