Vatious improvements and bug fixes/UI tweaks...