punctuation and minor bug fixes