More testing and cleanup and jdoc updates