some updates
error fix
some fineeee updates
merge conlict resolution
a few comments