Added some missing faces for xact amounts.
Minor refactoring and code cleanup