Updated, code cleanup, events all working. Config file soon?