Minor updates (and annoying onsong edits)