* made constants all CAPS
Minor changes.