fixed typo&missing stuff