Adding cases for trailing : ; ! and ?