preprocessor bugs fixed, test cases written, preprocessor should be stable now
merged