Updated to Alpha 7 and typo fixing