Fixed copy-paste errors.
Clean errant white space.
Remove old, inactive code.
Fix some issues with implicit paths.