JavaDoc & improvements