Some more java + todo updated