finished everuthing including comments