fixing sundry mistakes