Text style handling  + small fixes