some fixes and more docs