Additional tweaks after Chris' review