Total update & fixes