1.3.16

All of the minor fixes from 1.3.16