More debugging, some rewrites enabled