fix s key did not work
Merge branch 'minimap'