fix little typos and better design