finished mini-max plus other edits