Fixing refs + some typos