numerous fixes and updates