updated Travis and renamed some functions