Added and fixed various things. Mostly a test for jenkins.