added more grammar rules to cope with a more complex site.pp