Re-enabled defm macro
Fix reference to compile-model
Update documentation
Comment out un-needed code