more updates and changes