fix back to working state and renaming for clarity
narrowed down whitespace problem, kept in working state, added TODO about problem