Bug fixes; added possibility of choosing multiple equation types