fixes due to mykolas comments