minor improvements based on shop team feedback