WaypointData also inherits from Entity now, so I could alias Entity's API for it too. I've also made a number of comment tweaks.