Fixed journal entry type and system type lists, code cleanup.