Whitespace cleanup
Fix multi-parsing issue

Breaks base-url handling, but I'll have to do that better anyway