Bolt improvements

Nut and Bolt improvements as per issue.
Also updated files using the library.