Fixes and Documentation