Bug fixing, addition of helper methods, small change to AST and CSX.java