Fixed bug with delegated events (now backbone compatible), code cleanup