Minor Changes to fix the some of my stuff!