added better PATH stuff