tasks and files fixes