some fixes
moar fixes