major bugfixes, add arm support