Better text support and start on audio stuff