A big step up from 1 mechanically… but structurally? Caves are a good idea and can be REALLY fun and tricky, but are just as often tedious and ugly. I'd still say it's better than 1, but 100% completion sounds like torture and that's a bummer for a game like this!