Touch up workflow

Fixed a bunch of workflow issues