partly fixed wf; added new files