Updating to latest version

Cleaning up the last bits and pieces