Fixed the "easy" things that need to be done. I'm getting some sleep.