moved subClass to actual subClass. Removed legend
removed some more bad thread stuff