Documentation update, fixes

Some fixes and docs clarification