Small improvements and corrections