Added space objects. Other improvements and additions