Finish up and fix #521