Fix typos, style and little things for dead machine