fixed java method return support
added null to environment
cleaned the structure
Mergign changed on the structure