Fixed Ken's Express errors

Fixed a bunch of merge conflicts

@SquareDorito HTML input tag does not take any input