Draws locations to screen... sort of... and fixes bugs