fixes

fixings mistakes in prev commit