Merge more fixes/improvements from digrastudents.org