fixes and TODOs from play testing