Layout fixed, misc spelling