1) Added @Override annottations.
2) Addd Non Java docs.
3) Removed unused/commented code.