fixes after ride testing