a few changes that should have been here already from hatpull