added/better root support; cleaned old stuff