Ohshi Update

added roll tracking toggle and reworked some of the tables into sets and such