Added comments and tasks