moar fixes, yea