Small bugfixes. Renaming mecharg to jatos.