Renaming, Added 3 new task, Fixing comments