Add removeTask, comments and fix