fixed typos, non resolved references and added makeup