Improvements and corrections