fixed all the bugs from previous build
changes
sprint 2