Some more documentation and clarity fixes