moar fixes
another moar change