Fixed mixed spaces and tabs. Extended two player support