Updates, more cleanup