Final functionality tweaks