Changes to tweaks resulting from feedback so far