Fixes and more documentation