Renames, cleaning, and some minor additions.