fix travis file and some odds and ends