Added more terrain bonuses

Also fixed the highlights on the river tiles