changed the name of one of the libs; some minor changes.