tests and fixes, works fine so far, history tbtested