big update, lot cleaner tex and make