tweaks to accommodate locations and forms