Cleaning
Group - Corrections
renamming
fix manual bonus.