added some useful things
someone who knows the game well should do this
Merge remote-tracking branch 'origin/master'