Change path for Wahl, and some minor fixes