updates and fix