Added some alternate commands (Use at your own risk), as well as a few tweaks here and there. This version should also properly support the new preprocessor functionality.