continuing to make bugfixes