Fix #47. Fix #48. Minor bug fixes to player and pickem