Proper escaping, added dir and path