Cleans up js and moves to mashallah.js, updates waypoints.js