More changes to orginizations & bug fixes