[TASK] changed minor stuff