Basic arrest command, code improvements