Fixed startup file options for jndi and annotations and jaas. Fixed some other links and words.