Fix reading of comments, add runtime.