bugs fixed in SourceCodeGenerator.java