Tweaks and added flags.