fixed input names
bug fixes

still wip