ad more updates
minor cleanup