Made some misc modifications
Merged misc changes; trivial