Several minor fixes and first poison level
Merge pull request #20 from Kotzi/master

Several minor fixes and first poison level