Holiday Fixes

Whoops, committed before I fixed too little things in thanksgiving.as