dev improvements