Final Alpha 2.0 commit. Time for Alpha 2.1 work....

- Final bug fixes
- Started custom events