travis and minor cleanup