More work on all parts of tex