bugfix & test page