#18, #20 com-port compatibility and added payment window blocker