adds fixtures, clears up some naming issues