Update Adagios and kaji packages
Fix kaji package
Update TODO and Dockerfile