Adding comments and reviewing defaults/settings