more updates and additions