Catchup

Updated language, and some tasks