Updates to Scarlatine and other edits