Space revisions and various fixes.