some fixes
FIX