Updates2-fixes

more updates and fixes