Bug fixes and test page updates; Updates #1