Various updates and bug fixes from the last few days of commits