More documentation and fixes