Various updates and cleaning up