Misc Updates

Adding and Removing comments. Shuffling imports through Steward. Minor
cfg fixes.