small transition logic fix and fixed modal popup typo -- also fixed small validation bug