made some input boxes
fixed merge conflict