improve workflow, bug fixes