latest fixes and modifications