Fixed wrong references and also fixed some small typos