Minor reorginization and additional #defines / enums