Address issues 

Not gonna bother mucking around in the code to delete reinf in this PR.