Minor bug fixes, execution wokflow redesign