various corrections
various corrections