Fix all modules, somewhat working now