Started working on voucher changing activity, and minor code changes