fixes and doc finishing