Small fixes, onUpdate event added