Fixed some minor issues and improved the workflow