resolved bugs, have forgotten which exactly