Tweaks and suggestions