WIP: bug fixes