small changes, docs, TODOs
mega update