updates for various issues