Fixed bugs in calculator; added new vectors.