small typo and structure fixes