fixed everything except the style