Fixes and docs