Fixed paths and some whitespace.