final fix of whitespace almost back how it was, found some unnessearly commented out code and fixed that as well.