better diagnostic, better travis testing