Commented out simulator, fixed bug with preprocessor.