Bug fixes and updates per Cory