stripe fixing and more