Fixed lot of things to use the new moonbase mechanism