Added some Jdoc and some methods