Tweaks and a bugfix.