adding color, fix pie
merge