bugfixes and additions, too