fixed some db stuff. ported to new laptop