fixes with special equals
Merge branch 'Jonte'
Fixed event bug