added path translations & cleanup