Sprint 1 & 2 fixes for HUSACCT main repository.

Also merged with GG&C