fixes and update documentation