updates to fix some additional issues