bug fixes and values to df