more updates and fixes