Tmp commit.
Updated with misc utilities.
Minor modifications.