Implement remaining changes - besides new modules and ships