fixed some bugs with saber/treasures, more testing