Map fixes

- Added NPC Curos, fixes #610
- Added NPC Orockle, fixes #612
- Some fixes for #602