Added everything and fixed typo