More fixes
Brought errors down to just missing module errors (for now)
Updated/tweaked files