Switching to PG, cleaning factories and annotating, generating Genres