added attack selection, more notes