some changes
updtaed from upstream
Updated libraries.db by Eric