tweaks to var names