Javadoc tweak.
Merging in updates for Filter and Startup handling.