Several updates while working on short.codes.