add some db, comment stuff & merged source