Added more comments, saving before reorganizing