Update travis and fix somes cs bugs