Fixed everything, tested - works.