[TASK] Some code cleanup

Fixed some typos (some could have had a major impact) and missing variables/properties.