[642] Tweaks resulting from Antonio+Dread+Tom discussion