cleaned up the comments and some displays