removed some bugs in code-generation
Wrote a test-file (working, expect one line)