FIX most problems with Character Controller
Merged