Minor Improvements

-Minor improvements (perhaps)