Bug Fix & Database Update