Fixes and tweaks to interface