JavaDoccing and different improvements in 'core'