Allow variable payment, small bugfix