Fixes and small documentation