1.0 with typo fixes / better naming