More tasks
Fixed and added more tasks