bugfixes, getting there