Some changes on tij, others are code for my website