First pass at tweaks