added underscore, improved boxes and win state