bugfixes and trying to get travis-ci to work as i want