Fixed some abbreviations.
Finished up some cd to code refactoring.