UPDATED JavaDoc and fixed some spelling-mistakes