added consistency changes to groups, added maps of ships and groups to model