cleanup and fixing paths