Fixed little bugs with preprocessor and bug with 'new' or 'delete' in names