cleanup
more defaults
removed player choice
updated