wip bug fixes