minor changes - now every page should work at last