Last minute functionality tweaks