addede chore done by everyone and bug fixes