new levels, minor changes to many other thigns
merge