Housekeeping + fix typos