some fixes
asd