corrections

refer to blastoise commit for explanation