Added two more instruments and fixed minor bugs