some changes and fixed made during the first integration test
increased version