adding more table and wts/wtb stuff see changelog