Safety and mobility enhancements

Safety and mobility enhancements