Add WorldGuard region discovery and general tidy up