Adding misc changes
Merge branch 'xyzbooks' of github.com:Santosh700/Auto_Cap into xyzbooks