Changed BasicTextGenerator and updated most Classes