minor update, rearranged some things