Final touches
Merged
Fixed spaces