Small fixes + DB structure