Commits


porting changes


more tweaks.