final changes and fixes for workflow dev

final changes and fixes for workflow dev