Improve bonus system
Fix 2 typos