Fixed things that broke while things were being broke, in the process of adding things!