more minor editing, fix build on Travis