Minor modifications to orgentities
Merge branch 'designoverhaul' of github.com:Santosh700/Auto_Cap into designoverhaul