change order of final tasks
bugfixes
added dep