some fixes towards camera ready version