Travis setup + some bugfixes