fixed bug in classes that have multiple methods. fixed bug reporting in FunctionCall. tidied some redundant usings