Edited Task list and few bugs