Cleaned up a bit; made paths cleaner