Bugfix ferris wheels editing, refactoring