fixed test_arena
resolved merge conflicts with ivan
further merge conflict resolution
fixed weird issues from merge
cleanup after major debugging; corrected fish-eye perspective