Update and JJDoc

Various updates, pushed up the jjdoc