last fixes before the version 2