grammar tweaks, incomplete square retrofit generator