Treasure class added + fixes