Various smaller adjustments, added some missing counters to appendix