bugfixes; etc