rename task to work and fix little bugs