Fixed import path
Minor fixes to scoping & one typo