work in progress: fixing bugs after the merger