Updated comments and improved plotting