Some style tweaking and some rewrite rule tweaking (damn multiviews broke production)