cs fixes and update travis