Minor updates
Further task completion