Path to current subject added, minor fixes