merged in the goodies from CompJournoStick