Improvements and Documentation