some cleanup and corrections
7 files changed