cleaning code up, nuking freeze stuff, placing modules into config for reference