incorporated improved searching, correct bugs in charts