many style updates/fixes