Initial "fixed" commit, hopefully workflow will be better now.