Bug fixes for the auto mode - now operational !