Added non-arena support + more cleanup (hopefully)