butter cream smoothing and some credits
Merge branch 'butter' into testing