Minor fixes
Remembered more lines, woo\!