Final Update before Publishing

Lots of changes!