fix function display issue, fix some other things too