Feature/workflow overdue fixes

*golf clap for effective code reuse*