Fixing some details
Fixing tiny details