pulling in bugfixes