several fixes added
conflicts fixed