working edit rides, bug fixes, refactor