fixed all preprocessor command issues