added tola's work and minor fixes