Fixes + removal + move event performance increase