More fixes, 14. Currently working on spaces