Added new tables, fixed bug in findBVar, cosmetic changes