Updated definitions.
Minor bug fixes.