Project Drift: Minor fixes

Fixed some bugs Manual shifting and physical drift are under development.