style updates, fixes