added some comments
fixed javadoc header