Fixed up the payments - found some glaring holes.
Removed void returns for now.