minor updates and bugfixes