changed a couple things...