some backend (hacky) fixes and updated frontend. tests not fixed yet