Removed tasks and minor corrections + adjustments