removed debug page
more fixes
Merge branch 'test'