Fixes + additions

Bugfixes + additions of other homeworks