add jars, fix issues