line changes and tweaks