CJ Short methods

things that are joe's fault++

Fixing this in master.