final commit with 2 levels, lots of animals and small bug fixes
fix merge