general cleanup + add -C and -c
26 files changed