Added Features, Cosmetic Changes