cleaning
add settings
ignore state
implement battle timer