bugfixes; not done