bugfixes
cleanup
travis