#30 Improved the language a bit. Still not perfect but a lot better :)