Updating library

Cleaning up and adding node wire ups.