bugfixes to achieve functionality