Cleaner
Fixed some path issues