bug fixes, new test page