Slightly more JavaDoc
I will be releasing this as 0.7-BETA