Good points, fixed them in master.