Plenty of changes

Additions, renaming and tweaking!