:bug: Bug fixes for curve generation