Solved some tab vs space problems