Tweaks, fixes and additions