smoothed out transitions
fixed merge conflicts and we actually have something demoable