Remove warnings
Revise javadoc, add @Override