Fixed up State, changed Event dispatching a little and little fixes.