Clean-up, tests, amendments, travis-ci