Minor fixes
JavaDoc Fixes
Useful additions