Fixes to Path and other stuff.
merged bunch of stuff