Tidy up

Also changed med hummingbird to the civ version