Minor bugfixes/whitespace adjustments