Some fixes and better docs.