refactor: minor thingies
refactor: reorganise task code + refine options