complete "rewrite" to support language page names and few other goodies