major update

added home work #4
some fixes