updates to fix some issues