minor tweaks to turn bolt back on
minor tweaks and merged