Merge fixes and improvements from digrastudents.org