some changes and refunds ;)