Fixes and docs review