Updates and cosmetic fixes