updated with latest joyride, misc bugfixes