fixing more of the dir's