fixed whitespace issues, still playing around