bug fixing + database