Numerous fixes and updates