Fixed some bugs; now onto improvement procedures!