Apply changes made during sandiego.js hack night (reword later)