More program tweaks.