Added comments, among other things