some cleanup and corrections
14 files changed