Adding better command key, extra commented out stuff I've tried in the past