Bug Fix

Fixed some parsing bugs based around whitespace.