Fixed path bugs, interface improvements