arch fix / small style fixes