Fixed some comments and esthetics