Added aliases for units, moved code around

Most units are no longer case sensitive. Aliases added for some units so
you don't have to remember the short names of the units.