Fix improper reinforcement calls
Remove unused import
Fix parameter order
Change location of feedback method to prevent NPE