Added attack, improved movement