more tweaks + protection