Many bugfixes and usability improvements (thanks to oschn0r)