more small changes and corrections