More small fixes

I've been going through all the phase 2 test cases posted and making
sure our program is up to specs. I'll be working on this some more early
tomorrow and will hopefully figure out the blocking issue as well.