Various updates due to testing and review