some fixes after work with roman