fixed a few oddities from merge