fixing some minor order and testing errors, still wip