some cleanup and corrections
3 files changed