styling, state fixups