some bug fixes. still a task resume issue left