Bubble added, suitable place found, some functional fixes modified.