Added comments and bigger categories