White-space improvements and paths fixed.