Updated info and rearranged some things