WIP: few more small changes