allllmost done fixing whitespace parsing