added modules
fixed bug on composition of composed function