some small changes plus finishing challenge 7