Working on handling events in the client-side components
Fixing bugs #32 and #33