all done

need to do some improvements