Minor Fixes everywhere