Fixed .travis.yml, fixed some issues I found here and there