more updates, cleaning, etc