More Progress! Fixes!