various fixes
Merge branch 'master' of https://github.com/Ilmen-vodhr/ilmentufa