first
fixes, more tests