Various fixes

Added ModuleCall.
Cleaned code.