Various updates and fixes for 1.0 release