Fixed some mistakes, tested in Arena