WIP - Little fixes and Arena Plugin