fixed a couple things from merge