fixed universal code layout, and some typo stuff