Improvements and documentation