-some fixes style