More waypoint fixes and setup; some NGUI tweaks.

Signed-off-by: Dave Schaller <david@eduweb.com>