Fixed allocation of modules
Added more to TODO