Refactored database. Fixed compass waypoints nicely :)