Fix javadoc tags.
Integrate new commands.