Some minor edits and issue fixes