added test page, also some minor fixes