Basic functionality tweaks