First run fixes

Fix some low hanging fruit from my first run of the code.