fix some flex and cup issues