Content plugin performance

Fixed up errors - ready to go