ALL HAIL SPACES + some fixes.