Add comments, reinstall widgets