Updates and improvements from Jonas Koelker.