minor improvements, and a test is now ignored because of not working on travis