DB bugs fixed. and merged .