real 3 and 4, fixes, more tests