Minor bug fix
Updated comments and method names
Make parts of the web site work again after code updates