cleanup & fixes for most TODOs
Merge remote-tracking branch 'origin/Modules' into Modules