Added and reorganized some details