Fixed some "too tired to code" problems from last night, after reviewing code this morning.