Add in retry logic when getting transaction and few enhancements

Add in retry logic when getting transaction and few enhancements #562