Minor changes & new travis rules