some fixes 2
tmp