Fixed libraries and minor changes.