fixed typo and rearranged some items