Fixed a bug
Fixed a bug 2
Minor Tweaks