Removing some extra spaces in output sometimes
Fixing incorrect display of retry message on last attempt.