All right, I've made some of the requested changes, summarized here: https://news.ycombinator.com/item?id=49897068