almost done
some updates