added viewing of comments;
refactored a few things;