more updates and fixes for forking