Minor changes, moved a couple things