Various: fixes, implementation, refactoring for events & forms.