bunch more updates