Minor code changes

Commit simply so I can transfer to home machine