cleaning up the docs and some framework fixes