updates and fixes ;;; no win logic yet