Preprocessor improvememnts/features/tests