Home task 5 fixes
Home task 6: initial release