- last fixes before testing :)