Better functionality, so that the values can be read from the HTML.
A few changes to files, here and there.