Added jautodocs and additional comments