Multiple new features and bugfixes, see README