typo fixes
code issues fixes