Lots of minor changes, and new kudos solution