Add travis env and some improvements