fixes per Moxie
fix ws and newline issues
fix ws
fix ws