backend stuff
bug fixes