added some Sound events;
some fixes & refactoring;