Fix errors from bad merge. Progress and new features should be working.