Add Libraries and Bug Fix