added docs
removed handled/unneeded todos