Updated libraries and cleaned up.