Some bugfixes, template rewrite, post quotes now works as they should