Refactoring. Improved variable names. Fixes
Fixed bezier paths