Touched on a few files and cleaned up some warnings