Fixes

Need to fix some more when I get home.