Several minor fixes and first poison level