tweaks for plain mode