EFTPOS tweaks and fixes

See commit log for full description.