functionality tweaks