merged in fixes for COMPLETE/COMPLETED state wrong name, client-setup crash bug