A few small updates to this