fixes, end-to-end tests

OK, good