updated javadoc for interfaces and exception handling for implementations
fixed conflicts