Comparing photos to AmphibiaWeb I believe you are correct on both!