Add Short Code to Organisation, update incorrect comments