Main GameObject added / minor structural fixes