bug fixes and punctuation redesign