Minor fixes and corrections