Numerous updates and fixes