Update to formatting and added autoinclude for jar files on client