prototype cleanup
updated docs
updated todo
updated todo