finish tasks, small fixes