Added return of single modules
Needs list for mass compilation
Fixed function calls