minor fixes, travis should work now