Fixed path problems. Fixed whitespace problems.