added speaking type selection, some fixes