WIP
bug fixes