style, fixes