more styles, some fixes