Cleaned up terminology, javadoc, added security to elements, improved
test-case