Tweaked Player Controls
merging...
finish merging