Orginzation and minor fixes