fixed cash bugs