Additions, deletions, renaming, tweaking...

Bunch of stuff.