minor stuff + new event system

event system needs a major update...