getting somewhere with bugfixes