Better api urls. Please don't stomp me.
Clean up and more comments.