Mass typo fixes + general fixes