Added commarch (and bugfix in week 6 lecture)