updates to pass check and initial try at travis.ci