More cleanup, added better tabbing behavior, cleaned up focus and other events