Edited some other things to the objects, not a whole lot.