changed the last two little things