minor changes
Trying new version of bezier (off slides)
fixed merge conflicts