Artur: few changes and fixes