fixes for 7th task commit